From 1bb3aec7892561e4f4ea27c186bf0fd7605da41d Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 14 Jun 2015 15:40:13 -0500 Subject: [PATCH] Update debian/copyright* for 24.5 --- debian/copyright | 136 ++++++++++++++++++++++---------------------- debian/copyright.in | 136 ++++++++++++++++++++++---------------------- 2 files changed, 138 insertions(+), 134 deletions(-) diff --git a/debian/copyright b/debian/copyright index 09b26060245..e07418796ae 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,14 +3,11 @@ This package was debianized by Rob Browning on Tue, 16 Dec 1997 00:05:45 -0600. -The original source archive is emacs-24.4.tar.gz, and it -can be found here for stable releases: - - ftp://ftp.gnu.org:/gnu/emacs/ - -and here for alpha pre-releases: - - ftp://alpha.gnu.org:/gnu/emacs/pretest/ +The original source for this package can be found at +git://git.savannah.gnu.org/emacs.git under the emacs-24.5 tag. +That tag was used to create the Debian upstream archive +(emacs24_24.5+1.orig.tar.bz2) after making adjustments to comply with +the DFSG (see below). Please see /usr/share/doc/emacs24-common/README.Debian.gz for a description of the Debian specific differences from the upstream @@ -36,29 +33,28 @@ Copyright: License (GPL), Version 3. See the file /usr/share/common-licenses/GPL-3 for more information. - doc/man/b2m.1, doc/man/ebrowse.1, doc/man/grep-changelog.1, and - doc/man/rcs-checkin.1 are licensed as follows: + doc/man/ebrowse.1 and doc/man/grep-changelog.1 are licensed as + follows: - Copyright (C) 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. - Permission is granted to make and distribute verbatim copies of this - document provided the copyright notice and this permission notice are - preserved on all copies. + Permission is granted to make and distribute verbatim copies of + this document provided the copyright notice and this permission + notice are preserved on all copies. Permission is granted to copy and distribute modified versions of - this document under the conditions for verbatim copying, provided that - the entire resulting derived work is distributed under the terms of - a permission notice identical to this one. + this document under the conditions for verbatim copying, provided + that the entire resulting derived work is distributed under the + terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this document into another language, under the above conditions for - modified versions, except that this permission notice may be stated - in a translation approved by the Free Software Foundation. + modified versions, except that this permission notice may be + stated in a translation approved by the Free Software Foundation. doc/man/emacs.1 is licensed as follows: - Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 1995, 1999-2015 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission @@ -76,70 +72,73 @@ Copyright: doc/man/etags.1 is licensed as follows: - Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 1992, 1999, 2001-2015 Free Software Foundation, Inc. - Permission is granted to make and distribute verbatim copies of this - document provided the copyright notice and this permission notice are - preserved on all copies. + Permission is granted to make and distribute verbatim copies of + this document provided the copyright notice and this permission + notice are preserved on all copies. Permission is granted to copy and distribute modified versions of - this document under the conditions for verbatim copying, provided that - the entire resulting derived work is distributed under the terms of - a permission notice identical to this one. + this document under the conditions for verbatim copying, provided + that the entire resulting derived work is distributed under the + terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this document into another language, under the above conditions for - modified versions, except that this permission notice may be stated - in a translation approved by the Free Software Foundation. + modified versions, except that this permission notice may be + stated in a translation approved by the Free Software Foundation. etc/publicsuffix.txt is licensed as follows: - The contents of this file are subject to the Mozilla Public License Version - 1.1 (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" basis, - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - for the specific language governing rights and limitations under the - License. + This Source Code Form is subject to the terms of the Mozilla + Public License, v. 2.0. If a copy of the MPL was not distributed + with this file, You can obtain one at http://mozilla.org/MPL/2.0/. doc/misc/efaq.texi is licensed as follows: - This list of frequently asked questions about GNU Emacs with answers - (``FAQ'') may be translated into other languages, transformed into other - formats (e.g., Texinfo, Info, WWW, WAIS), and updated with new information. + Copyright (C) 2001-2015 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000 Reuven M. Lerner + Copyright (C) 1992, 1993 Steven Byrnes + Copyright (C) 1990, 1991, 1992 Joseph Brian Wells - The same conditions apply to any derivative of the FAQ as apply to the FAQ - itself. Every copy of the FAQ must include this notice or an approved - translation, information on who is currently maintaining the FAQ and how to - contact them (including their e-mail address), and information on where the - latest version of the FAQ is archived (including FTP information). + This list of frequently asked questions about GNU Emacs with + answers (``FAQ'') may be translated into other languages, + transformed into other formats (e.g., Texinfo, Info, WWW, WAIS), + and updated with new information. - The FAQ may be copied and redistributed under these conditions, except that - the FAQ may not be embedded in a larger literary work unless that work - itself allows free copying and redistribution. + The same conditions apply to any derivative of the FAQ as apply to + the FAQ itself. Every copy of the FAQ must include this notice or + an approved translation, information on who is currently + maintaining the FAQ and how to contact them (including their + e-mail address), and information on where the latest version of + the FAQ is archived (including FTP information). - [This version has been heavily edited since it was included in the Emacs - distribution.] + The FAQ may be copied and redistributed under these conditions, + except that the FAQ may not be embedded in a larger literary work + unless that work itself allows free copying and redistribution. + + [This version has been heavily edited since it was included in the + Emacs distribution.] doc/misc/efaq-w32.texi is licensed as follows: + Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc. + This list of frequently asked questions about GNU Emacs on MS Windows with answers (``FAQ'') may be translated into other languages, transformed into other formats (e.g. Texinfo, Info, WWW), and updated with new information. - The same conditions apply to any derivative of the FAQ as apply to the FAQ - itself. Every copy of the FAQ must include this notice or an approved - translation, information on who is currently maintaining the FAQ and how to - contact them (including their e-mail address), and information on where the - latest version of the FAQ is archived (including FTP information). + The same conditions apply to any derivative of the FAQ as apply to + the FAQ itself. Every copy of the FAQ must include this notice or + an approved translation, information on who is currently + maintaining the FAQ and how to contact them (including their + e-mail address), and information on where the latest version of + the FAQ is archived (including FTP information). - The FAQ may be copied and redistributed under these conditions, except that - the FAQ may not be embedded in a larger literary work unless that work - itself allows free copying and redistribution. + The FAQ may be copied and redistributed under these conditions, + except that the FAQ may not be embedded in a larger literary work + unless that work itself allows free copying and redistribution. lisp/obsolete/meese.el is licensed as follows: @@ -148,11 +147,13 @@ Copyright: msdos/sedadmin.inp is licensed as follows: + Copyright (C) 2014-2015 Free Software Foundation, Inc. + This file is part of GNU Emacs. - This file is free software; as a special exception, the author gives - unlimited permission to copy and/or distribute it, with or without - modifications, as long as this notice is preserved. + This file is free software; as a special exception, the author + gives unlimited permission to copy and/or distribute it, with or + without modifications, as long as this notice is preserved. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -167,6 +168,7 @@ Copyright: All of the files in m4/ except gnulib-comp.m4 are licensed as follows: - This file is free software; the Free Software Foundation - gives unlimited permission to copy and/or distribute it, - with or without modifications, as long as this notice is preserved. + Copyright (C) 2008-2015 Free Software Foundation, Inc. + This file is free software; the Free Software Foundation gives + unlimited permission to copy and/or distribute it, with or without + modifications, as long as this notice is preserved. diff --git a/debian/copyright.in b/debian/copyright.in index f0fdfcfa9ec..b0f7dc07adb 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -3,14 +3,11 @@ This package was debianized by Rob Browning on Tue, 16 Dec 1997 00:05:45 -0600. -The original source archive is emacs-@UPSTREAM_VERSION@.tar.gz, and it -can be found here for stable releases: - - ftp://ftp.gnu.org:/gnu/emacs/ - -and here for alpha pre-releases: - - ftp://alpha.gnu.org:/gnu/emacs/pretest/ +The original source for this package can be found at +git://git.savannah.gnu.org/emacs.git under the emacs-@UPSTREAM_VERSION@ tag. +That tag was used to create the Debian upstream archive +(@DEB_FLAVOR@_@DEBSRC_VERSION@.orig.tar.bz2) after making adjustments to comply with +the DFSG (see below). Please see /usr/share/doc/@DEB_FLAVOR@-common/README.Debian.gz for a description of the Debian specific differences from the upstream @@ -36,29 +33,28 @@ Copyright: License (GPL), Version 3. See the file /usr/share/common-licenses/GPL-3 for more information. - doc/man/b2m.1, doc/man/ebrowse.1, doc/man/grep-changelog.1, and - doc/man/rcs-checkin.1 are licensed as follows: + doc/man/ebrowse.1 and doc/man/grep-changelog.1 are licensed as + follows: - Copyright (C) 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. - Permission is granted to make and distribute verbatim copies of this - document provided the copyright notice and this permission notice are - preserved on all copies. + Permission is granted to make and distribute verbatim copies of + this document provided the copyright notice and this permission + notice are preserved on all copies. Permission is granted to copy and distribute modified versions of - this document under the conditions for verbatim copying, provided that - the entire resulting derived work is distributed under the terms of - a permission notice identical to this one. + this document under the conditions for verbatim copying, provided + that the entire resulting derived work is distributed under the + terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this document into another language, under the above conditions for - modified versions, except that this permission notice may be stated - in a translation approved by the Free Software Foundation. + modified versions, except that this permission notice may be + stated in a translation approved by the Free Software Foundation. doc/man/emacs.1 is licensed as follows: - Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 1995, 1999-2015 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission @@ -76,70 +72,73 @@ Copyright: doc/man/etags.1 is licensed as follows: - Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 1992, 1999, 2001-2015 Free Software Foundation, Inc. - Permission is granted to make and distribute verbatim copies of this - document provided the copyright notice and this permission notice are - preserved on all copies. + Permission is granted to make and distribute verbatim copies of + this document provided the copyright notice and this permission + notice are preserved on all copies. Permission is granted to copy and distribute modified versions of - this document under the conditions for verbatim copying, provided that - the entire resulting derived work is distributed under the terms of - a permission notice identical to this one. + this document under the conditions for verbatim copying, provided + that the entire resulting derived work is distributed under the + terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this document into another language, under the above conditions for - modified versions, except that this permission notice may be stated - in a translation approved by the Free Software Foundation. + modified versions, except that this permission notice may be + stated in a translation approved by the Free Software Foundation. etc/publicsuffix.txt is licensed as follows: - The contents of this file are subject to the Mozilla Public License Version - 1.1 (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" basis, - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - for the specific language governing rights and limitations under the - License. + This Source Code Form is subject to the terms of the Mozilla + Public License, v. 2.0. If a copy of the MPL was not distributed + with this file, You can obtain one at http://mozilla.org/MPL/2.0/. doc/misc/efaq.texi is licensed as follows: - This list of frequently asked questions about GNU Emacs with answers - (``FAQ'') may be translated into other languages, transformed into other - formats (e.g., Texinfo, Info, WWW, WAIS), and updated with new information. + Copyright (C) 2001-2015 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000 Reuven M. Lerner + Copyright (C) 1992, 1993 Steven Byrnes + Copyright (C) 1990, 1991, 1992 Joseph Brian Wells - The same conditions apply to any derivative of the FAQ as apply to the FAQ - itself. Every copy of the FAQ must include this notice or an approved - translation, information on who is currently maintaining the FAQ and how to - contact them (including their e-mail address), and information on where the - latest version of the FAQ is archived (including FTP information). + This list of frequently asked questions about GNU Emacs with + answers (``FAQ'') may be translated into other languages, + transformed into other formats (e.g., Texinfo, Info, WWW, WAIS), + and updated with new information. - The FAQ may be copied and redistributed under these conditions, except that - the FAQ may not be embedded in a larger literary work unless that work - itself allows free copying and redistribution. + The same conditions apply to any derivative of the FAQ as apply to + the FAQ itself. Every copy of the FAQ must include this notice or + an approved translation, information on who is currently + maintaining the FAQ and how to contact them (including their + e-mail address), and information on where the latest version of + the FAQ is archived (including FTP information). - [This version has been heavily edited since it was included in the Emacs - distribution.] + The FAQ may be copied and redistributed under these conditions, + except that the FAQ may not be embedded in a larger literary work + unless that work itself allows free copying and redistribution. + + [This version has been heavily edited since it was included in the + Emacs distribution.] doc/misc/efaq-w32.texi is licensed as follows: + Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc. + This list of frequently asked questions about GNU Emacs on MS Windows with answers (``FAQ'') may be translated into other languages, transformed into other formats (e.g. Texinfo, Info, WWW), and updated with new information. - The same conditions apply to any derivative of the FAQ as apply to the FAQ - itself. Every copy of the FAQ must include this notice or an approved - translation, information on who is currently maintaining the FAQ and how to - contact them (including their e-mail address), and information on where the - latest version of the FAQ is archived (including FTP information). + The same conditions apply to any derivative of the FAQ as apply to + the FAQ itself. Every copy of the FAQ must include this notice or + an approved translation, information on who is currently + maintaining the FAQ and how to contact them (including their + e-mail address), and information on where the latest version of + the FAQ is archived (including FTP information). - The FAQ may be copied and redistributed under these conditions, except that - the FAQ may not be embedded in a larger literary work unless that work - itself allows free copying and redistribution. + The FAQ may be copied and redistributed under these conditions, + except that the FAQ may not be embedded in a larger literary work + unless that work itself allows free copying and redistribution. lisp/obsolete/meese.el is licensed as follows: @@ -148,11 +147,13 @@ Copyright: msdos/sedadmin.inp is licensed as follows: + Copyright (C) 2014-2015 Free Software Foundation, Inc. + This file is part of GNU Emacs. - This file is free software; as a special exception, the author gives - unlimited permission to copy and/or distribute it, with or without - modifications, as long as this notice is preserved. + This file is free software; as a special exception, the author + gives unlimited permission to copy and/or distribute it, with or + without modifications, as long as this notice is preserved. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -167,6 +168,7 @@ Copyright: All of the files in m4/ except gnulib-comp.m4 are licensed as follows: - This file is free software; the Free Software Foundation - gives unlimited permission to copy and/or distribute it, - with or without modifications, as long as this notice is preserved. + Copyright (C) 2008-2015 Free Software Foundation, Inc. + This file is free software; the Free Software Foundation gives + unlimited permission to copy and/or distribute it, with or without + modifications, as long as this notice is preserved. -- 2.30.2